bitkeeper revision 1.1749 (42bbc434_aK0LSM1BC4FiLM_Xam_YA)
authorvh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk>
Fri, 24 Jun 2005 08:28:36 +0000 (08:28 +0000)
committervh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk>
Fri, 24 Jun 2005 08:28:36 +0000 (08:28 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/vh249/unstable.bk


Trivial merge